3 subject="""comment 2"""
4 date="2023-07-05T21:01:53Z"
6 I've fixed the data loss part of this bug.
8 `git-annex sync` is able to resolve the divergence too. But for some
9 reason, the first time it's run after the divergence, it leaves it
10 diverged, and the second time it resolves it. That needs to be fixed.